bitkeeper revision 1.1159.1.489 (41c1ae15sywguDGAUkFv75uAeynxkg)

build fixes

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 55603231a1641668526b61e09747bf56bc60577e..8609adc5210e94b7e20d9223a16f8b4e2fe09307 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -12,11 +12,11 @@ OBJS += $(patsubst %.c,%.o,$(wildcard mtrr/*.c))
 
 OBJS := $(subst $(TARGET_SUBARCH)/asm-offsets.o,,$(OBJS))
 
-ifneq ($(TARGET_SUBARCH),i386)
+ifneq ($(TARGET_SUBARCH),x86_32)
 OBJS := $(subst vmx.o,,$(OBJS))
 OBJS := $(subst vmx_io.o,,$(OBJS))
 OBJS := $(subst vmx_vmcs.o,,$(OBJS))
-endif ($(TARGET_SUBARCH),i386)
+endif ($(TARGET_SUBARCH),x86_32)
 
 default: boot/$(TARGET_SUBARCH).o $(OBJS) boot/mkelf32
        $(LD) $(LDFLAGS) -r -o arch.o $(OBJS)

diff --git a/xen/common/softirq.c b/xen/common/softirq.c
index ab2f243e15ef91632c0a6684ecbeebf6aca714b8..2a59925a074f3b8c8453697bf30221ed9b4bd2d9 100644 (file)
--- a/xen/common/softirq.c
+++ b/xen/common/softirq.c
@@ -13,7 +13,6 @@
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/sched.h>
-#include <asm/vmx_vmcs.h>
 #include <xen/softirq.h>
 
 irq_cpustat_t irq_stat[NR_CPUS];